Cleanup:

- Dereference arguments before matching
- use square brackets for vec! macro

diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs
index 0b7988c3975195da7411c713346b79acf5bbfb2e..f49a1fb347d12a53ac22ae0b8499beba0efff930 100644 (file)
--- a/src/cargo/ops/cargo_compile.rs
+++ b/src/cargo/ops/cargo_compile.rs
@@ -167,8 +167,8 @@ pub fn compile_pkg(package: &Package, options: &CompileOptions)
     let to_build = packages.iter().find(|p| p.package_id() == pkgid).unwrap();
     let targets = try!(generate_targets(to_build, mode, filter, release));
 
-    let target_with_args = match target_rustc_args {
-        &Some(args) => {
+    let target_with_args = match *target_rustc_args {
+        Some(args) => {
             if targets.len() > 1 {
                 return Err(human("extra arguments to `rustc` can only be \
                                   invoked for one target"))
@@ -178,10 +178,10 @@ pub fn compile_pkg(package: &Package, options: &CompileOptions)
             profile.rustc_args = Some(args.to_vec());
             Some((target, profile))
         },
-        &None => None,
+        None => None,
     };
 
-    let targets = target_with_args.as_ref().map(|&(t, ref p)| vec!((t, p)))
+    let targets = target_with_args.as_ref().map(|&(t, ref p)| vec![(t, p)])
                                            .unwrap_or(targets);
 
     let ret = {

diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs
index 839ec31f7231fb4f0a1321f293f3309ac10e248e..a06f7a6e1cd39a914f1d7f477a0bbe69eefca0dc 100644 (file)
--- a/src/cargo/ops/cargo_rustc/mod.rs
+++ b/src/cargo/ops/cargo_rustc/mod.rs
@@ -664,7 +664,7 @@ fn build_base_args(cx: &Context,
         cmd.arg("-g");
     }
 
-    if let &Some(ref args) = rustc_args {
+    if let Some(ref args) = *rustc_args {
         cmd.args(args);
     }